From 1931a4c8a95653a5c72215d1a1ae9b82b4e6637e Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 29 Dec 2015 10:04:03 +0100
Subject: [PATCH] Introduce a cargo-doc package

---
 debian/{cargo.doc-base => cargo-doc.doc-base} |  0
 debian/{cargo.docs => cargo-doc.docs}         |  0
 debian/changelog                              |  4 +++-
 debian/control                                | 24 ++++++++++++++++++-
 debian/docs                                   |  1 -
 debian/rules                                  |  2 ++
 6 files changed, 28 insertions(+), 3 deletions(-)
 rename debian/{cargo.doc-base => cargo-doc.doc-base} (100%)
 rename debian/{cargo.docs => cargo-doc.docs} (100%)
 delete mode 100644 debian/docs

diff --git a/debian/cargo.doc-base b/debian/cargo-doc.doc-base
similarity index 100%
rename from debian/cargo.doc-base
rename to debian/cargo-doc.doc-base
diff --git a/debian/cargo.docs b/debian/cargo-doc.docs
similarity index 100%
rename from debian/cargo.docs
rename to debian/cargo-doc.docs
diff --git a/debian/changelog b/debian/changelog
index 8c210b299..a594298a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 cargo (0.6.0-2) unstable; urgency=medium
 
+  * Introduce a cargo-doc package
   * Fails to build when wget is installed. Force curl
     (Closes: #809298)
   * Add the missing VCS- fields
 
- --
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 29 Dec 2015 10:03:10 +0100
 
 cargo (0.6.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index fb2cad1c5..97fbeb570 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
          rustc (>= 1.1),
          binutils,
          gcc | clang | c-compiler
+Suggests: cargo-doc
 Description: Rust package manager
  Cargo is a tool that allows Rust projects to declare their various
  dependencies, and ensure that you'll always get a repeatable build.
@@ -40,9 +41,30 @@ Description: Rust package manager
  To accomplish this goal, Cargo does four things:
   * Introduces two metadata files with various bits of project information.
   * Fetches and builds your project's dependencies.
-  * Invokes rustc or another build tool with the correct parameters to build 
+  * Invokes rustc or another build tool with the correct parameters to build
     your project.
   * Introduces conventions, making working with Rust projects easier.
  .
  Cargo downloads your Rust project’s dependencies and compiles your
  project.
+
+
+Package: cargo-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, libjs-jquery
+Description: Rust package manager, documentation
+ Cargo is a tool that allows Rust projects to declare their various
+ dependencies, and ensure that you'll always get a repeatable build.
+ .
+ To accomplish this goal, Cargo does four things:
+  * Introduces two metadata files with various bits of project information.
+  * Fetches and builds your project's dependencies.
+  * Invokes rustc or another build tool with the correct parameters to build
+    your project.
+  * Introduces conventions, making working with Rust projects easier.
+ .
+ Cargo downloads your Rust project’s dependencies and compiles your
+ project.
+ .
+ This package contains the documentation.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 311b17089..000000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-target/doc/*
diff --git a/debian/rules b/debian/rules
index 87fe150a6..2888835cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,8 @@ override_dh_auto_build:
 	# Build final cargo binary and docs
 	$(MAKE)
 	$(MAKE) doc
+	cd target/doc/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js
+
 	# Restore from workarounds
 	mv $(CURDIR)/.deps $(DEPSDIR)
 
-- 
2.30.2